Auto merge of #1847 - steveklabnik:gh1707, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 27 Jul 2015 23:18:25 +0000 (23:18 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Jul 2015 23:18:25 +0000 (23:18 +0000)
commit377feb9da1df70a8e8e28b211fe65f4be307112e
treee557f1890066b1c9c40eaf6b2ee0693541d74a87
parentbecf987d4c9e4d7fc76473e624f0ef4fa7930d02
parent9ff773498ce9c526382dd49c710d4365ee82a050
Auto merge of #1847 - steveklabnik:gh1707, r=alexcrichton

Fixes #1707